e43861
@@ -1493,7 +1493,7 @@
public static Path getOriginalLocation(
   }
 
   public static boolean isNonNativeTable(Table table) {
-    if (table == null) {
+    if (table == null || table.getParameters() == null) {
       return false;
     }
     return (table.getParameters().get(hive_metastoreConstants.META_TABLE_STORAGE) != null);
